a05f7aabb0888e1d3f182e6d64f14ee2b4f10a50,plugin.idea/test/com/microsoft/alm/plugin/idea/tfvc/core/tfs/conflicts/ResolveConflictHelperTest.java,ResolveConflictHelperTest,testMerge_Rename_TakeTheirs,#,151

Before Change


    @Test
    public void testMerge_Rename_TakeTheirs() throws Exception {
        renameTest(((RenameConflict) CONFLICT_RENAME).getServerPath());
        verify(helper).resolveConflictWithProgress(CONFLICT_RENAME.getLocalPath(), ((RenameConflict) CONFLICT_RENAME).getServerPath(), ResolveConflictsCommand.AutoResolveType.TakeTheirs, mockServerContext, mockResolveConflictsModel, true);
    }

    @Test

After Change


    @Test
    public void testMerge_Rename_TakeTheirs() throws Exception {
        renameTest(((RenameConflict) CONFLICT_RENAME).getServerPath());
        verify(helper).resolveConflictWithProgress(Matchers.eq(CONFLICT_RENAME.getLocalPath()), Matchers.eq(((RenameConflict) CONFLICT_RENAME).getServerPath()), Matchers.eq(ResolveConflictsCommand.AutoResolveType.TakeTheirs), Matchers.eq(mockServerContext), Matchers.eq(mockResolveConflictsModel), Matchers.eq(true), any(NameMergerResolution.class));
    }

    @Test